]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
data: Really strip .desktop suffix from folder directory
authorFlorian Müllner <fmuellner@gnome.org>
Fri, 29 Nov 2024 13:55:56 +0000 (14:55 +0100)
committerFlorian Müllner <fmuellner@gnome.org>
Fri, 29 Nov 2024 18:49:02 +0000 (19:49 +0100)
Commit 730fcf34e9 was meant to strip the .desktop suffix from the
desktop directory file, but failed to actually do so: The replace()
method is called on the string parameter before it is passed to
the meson command which substitutes `@BASENAME@`, so it doesn't
have any effect at all.

Really fix the issue by providing the full output name.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3567>

data/meson.build

index 1d2347d4d54a77ec5c5d5e0e9cba25626bb4e1a8..c8f82bd753b5673c277a09782448def80dcf5d22 100644 (file)
@@ -32,9 +32,10 @@ foreach desktop_file : desktop_files
   )
 endforeach
 
+desktop_directory = 'X-GNOME-Shell-Utilities.directory'
 i18n.merge_file(
-  input: 'X-GNOME-Shell-Utilities.directory.desktop.in',
-  output: '@BASENAME@'.replace('.desktop', ''),
+  input: f'@desktop_directory@.desktop.in',
+  output: desktop_directory,
   po_dir: po_dir,
   install: true,
   install_dir: join_paths(datadir, 'desktop-directories'),